Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Overlay when not preserving truth particles #2

Merged
merged 5 commits into from
Sep 13, 2021
Merged

Fix Overlay when not preserving truth particles #2

merged 5 commits into from
Sep 13, 2021

Conversation

gridge
Copy link

@gridge gridge commented Apr 2, 2021

This PR correctly resets the links to the original truth particles when merging the overlay tracker hit collections from the BIB to the main collision event. The current setup woul keep the pointer to a value that becomes invalid and causes segmentation violation if tried to be used (and no way to say that it's invalid).

In the process, this PR also ensures the proper Overlay flag in simulated tracker hits is correctly set.

BEGINRELEASENOTES

  • Fix Overlay algorithm to reset tracker hit pointers to Overlay MC particles when those are not preserved. Keep momentum information anyway before setting the link to a null pointer.
  • Actually setting overlay flag in simulated tracker hit

ENDRELEASENOTES

@@ -21,7 +21,7 @@ SET( ${PROJECT_NAME}_VERSION_PATCH 0 )
FIND_PACKAGE( ILCUTIL REQUIRED COMPONENTS ILCSOFT_CMAKE_MODULES )

# load default settings from ILCSOFT_CMAKE_MODULES
INCLUDE( ilcsoft_default_settings )
#INCLUDE( ilcsoft_default_settings )
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quick question for whoever has time. I always have to comment this out when compiling this locally with other packages due to an otherwise multiply defined unistall make target, although I seem to see a protection against this in the main make files included, but apparently it's not working well. Anyone else having these problems?
I can of course revert this change for the PR, since this should not be changed in the main mc branch.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pandreetto is looking into this

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean when you write "compiling with other packages"?
Are you trying to merge the compilation of multiple components somehow?
If I remove the instruction above, cmake reports an error (Unknown CMake command "ADD_SHARED_LIBRARY")

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @pandreetto , I've posted here the instructions to reproduce the problem:
MuonColliderSoft/LCTuple#4
(it happens for all packages)

Base automatically changed from mc to master June 8, 2021 09:36
@gianelle gianelle merged commit 750dafd into master Sep 13, 2021
@gianelle gianelle deleted the mc-lbl branch September 13, 2021 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants